From: Ross Vandegrift <ross@kallisti.us>
Date: Mon, 16 Jan 2023 21:35:46 +0000 (-0800)
Subject: dhcpv4: improve error when a prefix is too long
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=c9e619f015fdcc520c850f8a16e5046fea9660da;p=project%2Fodhcpd.git

dhcpv4: improve error when a prefix is too long

If a user tries to enable dhcpv4 on an interface with a /29, odhcp won't work.
The logs will only contain a message that doesn't help identify the problem.
It'd be idea to support any prefix with a valid pool, but at least this would
point a confused user in the right direction.

Signed-off-by: Ross Vandegrift <ross@kallisti.us>
---

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 2b2f41e..3191ff2 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -37,6 +37,7 @@
 
 #define PACKET_SIZE(start, end) (((uint8_t *)end - (uint8_t *)start) < DHCPV4_MIN_PACKET_SIZE ? \
 				 DHCPV4_MIN_PACKET_SIZE : (uint8_t *)end - (uint8_t *)start)
+#define MAX_PREFIX_LEN 28
 
 static void dhcpv4_netevent_cb(unsigned long event, struct netevent_handler_info *info);
 static int setup_dhcpv4_addresses(struct interface *iface);
@@ -248,9 +249,9 @@ static int setup_dhcpv4_addresses(struct interface *iface)
 		}
 	}
 
-	/* Don't allocate IP range for subnets bigger than 28 */
-	if (iface->addr4[0].prefix > 28) {
-		syslog(LOG_WARNING, "Auto allocation of DHCP range fails on %s", iface->name);
+	/* Don't allocate IP range for subnets smaller than /28 */
+	if (iface->addr4[0].prefix > MAX_PREFIX_LEN) {
+		syslog(LOG_WARNING, "Auto allocation of DHCP range fails on %s (prefix length must be < %d).", iface->name, MAX_PREFIX_LEN + 1);
 		return -1;
 	}